merge from trunk

diff --cc configure.ac
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/window.c
Simple merge